Prefer /usr/share/info/emacs-MAJORVERSION

Emacs prefers /usr/share/info/emacs-MAJORVERSION to /usr/share/info.

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.

diff --git a/lisp/info.el b/lisp/info.el
index 6426cfcf9ed93f295e91f56f812ffcf5bf7a01d1..d8a7f72e5dcaac5eaee96abba09cd10f335de470 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -218,7 +218,8 @@ A header-line does not scroll with the rest of the buffer."
              (nconc standard-info-dirs (list config-dir))
            (cons config-dir standard-info-dirs))))
     (if (not (eq system-type 'windows-nt))
-       dirs
+        ;; Debian: add per-flavor info directory in front.
+        (cons (format "/usr/share/info/emacs-%d" emacs-major-version) dirs)
       ;; Include the info directory near where Emacs executable was installed.
       (let* ((instdir (file-name-directory invocation-directory))
             (dir1 (expand-file-name "../info/" instdir))